From e27c13f119e4a2026ec641c893b9d6d6c9f9e556 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 12 May 2010 09:09:40 +0100 Subject: [PATCH] mce: MCE polling logic should check mce_disabled during initialisation. Signed-off-by: Keir Fraser --- xen/arch/x86/cpu/mcheck/non-fatal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 124d4aa504..2ab2b5cbc2 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -91,7 +91,7 @@ static int __init init_nonfatal_mce_checker(void) struct cpuinfo_x86 *c = &boot_cpu_data; /* Check for MCE support */ - if (!mce_available(c)) + if (mce_disabled || !mce_available(c)) return -ENODEV; /* -- 2.30.2